From 573b20a8f88e8dd2a622fde09201fd2543706ee4 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 9 May 2020 12:09:13 -0400
Subject: [PATCH] Drop gtk_widget_destroyed

Use g_object_add_weak_pointer or a weak reference instead.
---
 docs/reference/gtk/gtk4-sections.txt |  1 -
 gtk/gtkwidget.c                      | 25 -------------------------
 gtk/gtkwidget.h                      |  3 ---
 3 files changed, 29 deletions(-)

diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt
index 807d92b3a9..d6995e8f4f 100644
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -3957,7 +3957,6 @@ GtkAllocation
 gtk_widget_new
 gtk_widget_destroy
 gtk_widget_in_destruction
-gtk_widget_destroyed
 gtk_widget_unparent
 gtk_widget_show
 gtk_widget_hide
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index b7c14e5223..fe1878340e 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -2657,31 +2657,6 @@ gtk_widget_destroy (GtkWidget *widget)
     g_object_run_dispose (G_OBJECT (widget));
 }
 
-/**
- * gtk_widget_destroyed:
- * @widget: a #GtkWidget
- * @widget_pointer: (inout) (transfer none): address of a variable that contains @widget
- *
- * This function sets *@widget_pointer to %NULL if @widget_pointer !=
- * %NULL.  It’s intended to be used as a callback connected to the
- * “destroy” signal of a widget. You connect gtk_widget_destroyed()
- * as a signal handler, and pass the address of your widget variable
- * as user data. Then when the widget is destroyed, the variable will
- * be set to %NULL. Useful for example to avoid multiple copies
- * of the same dialog.
- **/
-void
-gtk_widget_destroyed (GtkWidget      *widget,
-		      GtkWidget      **widget_pointer)
-{
-  /* Don't make any assumptions about the
-   *  value of widget!
-   *  Even check widget_pointer.
-   */
-  if (widget_pointer)
-    *widget_pointer = NULL;
-}
-
 static void
 gtk_widget_update_paintables (GtkWidget *widget)
 {
diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index f18ae9899e..3aa805cd3d 100644
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -302,9 +302,6 @@ GtkWidget* gtk_widget_new                 (GType                type,
 GDK_AVAILABLE_IN_ALL
 void       gtk_widget_destroy             (GtkWidget           *widget);
 GDK_AVAILABLE_IN_ALL
-void       gtk_widget_destroyed           (GtkWidget           *widget,
-                                           GtkWidget          **widget_pointer);
-GDK_AVAILABLE_IN_ALL
 void       gtk_widget_unparent            (GtkWidget           *widget);
 GDK_AVAILABLE_IN_ALL
 void       gtk_widget_show                (GtkWidget           *widget);
-- 
2.30.2